]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
build: Use fixed gettext domain for non-subproject extension-tool builds
authorFlorian Müllner <fmuellner@gnome.org>
Thu, 5 Mar 2020 13:28:21 +0000 (14:28 +0100)
committerFlorian Müllner <fmuellner@gnome.org>
Sat, 21 Mar 2020 19:44:43 +0000 (20:44 +0100)
Clarify how the option is supposed to be used by
 - ignoring it for non-subproject builds
 - enforcing that it is set for subproject builds

https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1072

subprojects/extensions-tool/meson.build
subprojects/extensions-tool/meson_options.txt

index 0cee11234899258bf24626fc10989cf8c50d8ae2..ffaf49bd3271cb6713d05e70473ec41c1d1998b2 100644 (file)
@@ -9,7 +9,14 @@ gio_req = '>= 2.56.0'
 gnome = import('gnome')
 i18n  = import('i18n')
 
-package_name = get_option('package_name')
+if meson.is_subproject()
+  package_name = get_option('package_name')
+  assert(package_name != '',
+    'package_name must be specified for subproject builds')
+else
+  package_name = meson.project_name()
+endif
+
 package_version = meson.project_version()
 prefix = get_option('prefix')
 
index d106bf889608a009f0aa425cb9c0807df6894041..9963d8ff7ef2d50564bc8dc6fded5b295dc105b5 100644 (file)
@@ -7,6 +7,5 @@ option('man',
 
 option('package_name',
   type: 'string',
-  value: 'gnome-extensions-tool',
-  description: 'The gettext domain name'
+  description: 'The gettext domain name when used as a subproject'
 )